390. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:20 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

390.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Checkout/web/css/source/module/checkout_sidebar-shipping-information.less2016-05-15 09:50:28 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto_rtl/Magento_Checkout/web/css/source/module/checkout_sidebar-shipping-information.less2016-05-15 09:50:28 +0000

390.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1144
Changed00
Inserted00
Removed00

390.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

390.4 Active regular expressions

No regular expressions were active.

390.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Variables 7 //  Variables
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 @checkout-sidebar-shipping-information__padding: @indent__l; 10 @checkout-sidebar-shipping-information__padding: @indent__l;
11 @checkout-sidebar-shipping-information__line-height: @checkout-billing-address-details__line-height; 11 @checkout-sidebar-shipping-information__line-height: @checkout-billing-address-details__line-height;
12  12 
13 @checkout-sidebar-shipping-information-edit-icon__color: @minicart-icons-color; 13 @checkout-sidebar-shipping-information-edit-icon__color: @minicart-icons-color;
14 @checkout-sidebar-shipping-information-edit-icon__content: @icon-settings; 14 @checkout-sidebar-shipping-information-edit-icon__content: @icon-settings;
15 @checkout-sidebar-shipping-information-edit-icon__font-size: 28px; 15 @checkout-sidebar-shipping-information-edit-icon__font-size: 28px;
16 @checkout-sidebar-shipping-information-edit-icon__line-height: 28px; 16 @checkout-sidebar-shipping-information-edit-icon__line-height: 28px;
17 @checkout-sidebar-shipping-information-edit-icon__top: 0; 17 @checkout-sidebar-shipping-information-edit-icon__top: 0;
18 @checkout-sidebar-shipping-information-edit-icon__hover__color: @minicart-icons-color; 18 @checkout-sidebar-shipping-information-edit-icon__hover__color: @minicart-icons-color;
19  19 
20 // 20 //
21 //  Common 21 //  Common
22 //  _____________________________________________ 22 //  _____________________________________________
23  23 
24 & when (@media-common = true) { 24 & when (@media-common = true) {
25  25 
26     // 26     //
27     //  Shipping Information 27     //  Shipping Information
28     //  --------------------------------------------- 28     //  ---------------------------------------------
29  29 
30     .opc-block-shipping-information { 30     .opc-block-shipping-information {
31  31 
32         .shipping-information-title { 32         .shipping-information-title {
33             &:extend(.abs-checkout-title all); 33             &:extend(.abs-checkout-title all);
34             .lib-css(border-bottom, @checkout-step-title__border); 34             .lib-css(border-bottom, @checkout-step-title__border);
35             margin: 0 0 @indent__base; 35             margin: 0 0 @indent__base;
36             position: relative; 36             position: relative;
37  37 
38             .action-edit { 38             .action-edit {
39                 &:extend(.abs-action-button-as-link all); 39                 &:extend(.abs-action-button-as-link all);
40                 .lib-css(top, @checkout-sidebar-shipping-information-edit-icon__top); 40                 .lib-css(top, @checkout-sidebar-shipping-information-edit-icon__top);
41                 .lib-icon-font( 41                 .lib-icon-font(
42                     @checkout-sidebar-shipping-information-edit-icon__content, 42                     @checkout-sidebar-shipping-information-edit-icon__content,
43                     @_icon-font-size: @checkout-sidebar-shipping-information-edit-icon__font-size, 43                     @_icon-font-size: @checkout-sidebar-shipping-information-edit-icon__font-size,
44                     @_icon-font-line-height: @checkout-sidebar-shipping-information-edit-icon__line-height, 44                     @_icon-font-line-height: @checkout-sidebar-shipping-information-edit-icon__line-height,
45                     @_icon-font-text-hide: true, 45                     @_icon-font-text-hide: true,
46                     @_icon-font-color: @checkout-sidebar-shipping-information-edit-icon__color, 46                     @_icon-font-color: @checkout-sidebar-shipping-information-edit-icon__color,
47                     @_icon-font-color-hover: @checkout-sidebar-shipping-information-edit-icon__hover__color, 47                     @_icon-font-color-hover: @checkout-sidebar-shipping-information-edit-icon__hover__color,
48                     @_icon-font-color-active: @checkout-sidebar-shipping-information-edit-icon__color 48                     @_icon-font-color-active: @checkout-sidebar-shipping-information-edit-icon__color
49                 ); 49                 );
50                 margin: 0; 50                 margin: 0;
51                 position: absolute; 51                 position: absolute;
52                 left: 0; 52                 left: 0;
53                  53                 
54                 &:before { 54                 &:before {
55                     display: block; 55                     display: block;
56                 } 56                 }
57             } 57             }
58         } 58         }
59  59 
60         .shipping-information-content { 60         .shipping-information-content {
61             .lib-css(line-height, @checkout-sidebar-shipping-information__line-height); 61             .lib-css(line-height, @checkout-sidebar-shipping-information__line-height);
62             .actions-toolbar { 62             .actions-toolbar {
63                 margin-right: 0; 63                 margin-right: 0;
64             } 64             }
65         } 65         }
66  66 
67         .ship-to, 67         .ship-to,
68         .ship-via { 68         .ship-via {
69             margin: 0 0 @indent__base; 69             margin: 0 0 @indent__base;
70         } 70         }
71     } 71     }
72 } 72 }